Remove remnants of --with-cet and --enable-pdb

diff --git a/GPSBabel.xcodeproj/project.pbxproj b/GPSBabel.xcodeproj/project.pbxproj
index d2908e0af1697cc7593c57a326dc1be63adca182..a9f5a31e1cceb80edaf730a3f0aef550447cd652 100644 (file)
--- a/GPSBabel.xcodeproj/project.pbxproj
+++ b/GPSBabel.xcodeproj/project.pbxproj
@@ -1709,10 +1709,8 @@
                                        "-DNEW_STRINGS",
                                        "-DMAXIMAL_ENABLED",
                                        "-DFILTERS_ENABLED",
-                                       "-DPDBFMTS_ENABLED",
                                        "-DSHAPELIB_ENABLED",
                                        "-DCSVFMTS_ENABLED",
-                                       "-DCET_WANTED",
                                        "-DQT_NO_DEBUG",
                                        "-DQT_CORE_LIB",
                                );
@@ -1730,10 +1728,8 @@
                                        "-DNEW_STRINGS",
                                        "-DMAXIMAL_ENABLED",
                                        "-DFILTERS_ENABLED",
-                                       "-DPDBFMTS_ENABLED",
                                        "-DSHAPELIB_ENABLED",
                                        "-DCSVFMTS_ENABLED",
-                                       "-DCET_WANTED",
                                        "-DQT_NO_DEBUG",
                                        "-DQT_CORE_LIB",
                                );
@@ -1804,10 +1800,8 @@
                                        "-DNEW_STRINGS",
                                        "-DMAXIMAL_ENABLED",
                                        "-DFILTERS_ENABLED",
-                                       "-DPDBFMTS_ENABLED",
                                        "-DSHAPELIB_ENABLED",
                                        "-DCSVFMTS_ENABLED",
-                                       "-DCET_WANTED",
                                        "-DQT_NO_DEBUG",
                                        "-DQT_CORE_LIB",
                                );
@@ -1825,10 +1819,8 @@
                                        "-DNEW_STRINGS",
                                        "-DMAXIMAL_ENABLED",
                                        "-DFILTERS_ENABLED",
-                                       "-DPDBFMTS_ENABLED",
                                        "-DSHAPELIB_ENABLED",
                                        "-DCSVFMTS_ENABLED",
-                                       "-DCET_WANTED",
                                        "-DQT_NO_DEBUG",
                                        "-DQT_CORE_LIB",
                                );

diff --git a/GPSBabel.xcodeproj/qt_preprocess.mak b/GPSBabel.xcodeproj/qt_preprocess.mak
index d3f70bc1c32993515ed0a4494a9a9f5be11cce00..3dfaff8ce73df9fe969b93cbf65fc59288cbbf3f 100644 (file)
--- a/GPSBabel.xcodeproj/qt_preprocess.mak
+++ b/GPSBabel.xcodeproj/qt_preprocess.mak
@@ -14,7 +14,7 @@ LEX       = flex
 LEXFLAGS  = 
 YACC      = yacc
 YACCFLAGS = -d
-DEFINES       = -DHAVE_NANOSLEEP -DHAVE_LIBUSB -DHAVE_GLOB -DHAVE_VA_COPY -DHAVE_VA_LIST_AS_ARRAY -DNEW_STRINGS -DMAXIMAL_ENABLED -DFILTERS_ENABLED -DPDBFMTS_ENABLED -DSHAPELIB_ENABLED -DCSVFMTS_ENABLED -DCET_WANTED -DQT_NO_DEBUG -DQT_CORE_LIB
+DEFINES       = -DHAVE_NANOSLEEP -DHAVE_LIBUSB -DHAVE_GLOB -DHAVE_VA_COPY -DHAVE_VA_LIST_AS_ARRAY -DNEW_STRINGS -DMAXIMAL_ENABLED -DFILTERS_ENABLED -DSHAPELIB_ENABLED -DCSVFMTS_ENABLED -DQT_NO_DEBUG -DQT_CORE_LIB
 INCPATH       = -I../../Qt5.2.1/5.2.1/clang_64/mkspecs/macx-clang -I. -Ijeeps -Imac/libusb -I../../Qt5.2.1/5.2.1/clang_64/lib/QtCore.framework/Versions/5/Headers -I. -F/Users/robertlipe/Qt5.2.1/5.2.1/clang_64/lib
 DEL_FILE  = rm -f
 MOVE      = mv -f

diff --git a/Makefile.in b/Makefile.in
index f4b6c0649182b1033655182b0659a1b82600952d..4f566e5354efaa75c312fb9c2577fca77e3aba6f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -357,13 +357,13 @@ release-rpm:
 #
 
 cross-configure:
-         CXX=i386-mingw32-gcc LDFLAGS="-s" @srcdir@/configure --host=i386-pc-mingw32 --with-cet=all
+         CXX=i386-mingw32-gcc LDFLAGS="-s" @srcdir@/configure --host=i386-pc-mingw32
 
 release-winbuild:
        rm -fr /tmp/gpsbabel-$(VERSIOND)-cross
        cp -a gpsbabel-$(VERSIOND) /tmp/gpsbabel-$(VERSIOND)-cross
        cd /tmp/gpsbabel-$(VERSIOND)-cross ; \
-         CXX=i386-mingw32-gcc LDFLAGS="-s" ./configure --host=i386-pc-mingw32 --with-cet=all && make && \
+         CXX=i386-mingw32-gcc LDFLAGS="-s" ./configure --host=i386-pc-mingw32 && make && \
          zip -j /tmp/gpsbabel-$(VERSIOND).zip $(WINFILES)
        rm -fr /tmp/gpsbabel-$(VERSIOND)-cross
 

diff --git a/tools/gcfg b/tools/gcfg
index e8eb8b7488b9439f8b2610eb4fca7e80c6be9794..e6cef305f8180257e30752d2dd937e2911608dff 100755 (executable)
--- a/tools/gcfg
+++ b/tools/gcfg
@@ -6,10 +6,6 @@ CC=/usr/local/cross-tools/bin/i386-mingw32msvc-gcc  \
 $S/configure --host=i386-pc-mingw32 \
         --without-zlib \
   --disable-shapefile \
-  --disable-pdb \
   --disable-csv \
-  --disable-filters \
-        --without-cet \
-        --without-pdb \
-        --without-filters
+  --disable-filters